implement boolean property "truncate-multiline" which, when enabled,

2005-12-19  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkentry.c: implement boolean property "truncate-multiline"
	which, when enabled, truncates multi-line pastes or drops to their
	first line. Fixes bug #322252.

	* gtk/gtkfilechooserentry.c (gtk_file_chooser_entry_init): enable
	truncate-multiline here.

diff --git a/ChangeLog b/ChangeLog
index 0605fee1b59f3ba011e6963e9a746088fa5b2b41..9e8132f51be1055f63976ef1d412d4c4fb9bd2d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-12-19  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkentry.c: implement boolean property "truncate-multiline"
+       which, when enabled, truncates multi-line pastes or drops to their
+       first line. Fixes bug #322252.
+
+       * gtk/gtkfilechooserentry.c (gtk_file_chooser_entry_init): enable
+       truncate-multiline here.
+
 2005-12-17  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtksettings.c (get_color_hash): Don't crash if
@@ -194,7 +203,7 @@ Tue Dec  6 10:32:17 2005  Tim Janik  <timj@gtk.org>
 
        * gdk/x11/gdkevents-x11.c: map the new GtkSettings properties
        "timeout-initial", "timeout-repeat", "color-scheme" and
-       "enable-enimations" to X settings.
+       "enable-animations" to X settings.
 
 2005-12-05  Matthias Clasen  <mclasen@redhat.com>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0605fee1b59f3ba011e6963e9a746088fa5b2b41..9e8132f51be1055f63976ef1d412d4c4fb9bd2d8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2005-12-19  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkentry.c: implement boolean property "truncate-multiline"
+       which, when enabled, truncates multi-line pastes or drops to their
+       first line. Fixes bug #322252.
+
+       * gtk/gtkfilechooserentry.c (gtk_file_chooser_entry_init): enable
+       truncate-multiline here.
+
 2005-12-17  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtksettings.c (get_color_hash): Don't crash if
@@ -194,7 +203,7 @@ Tue Dec  6 10:32:17 2005  Tim Janik  <timj@gtk.org>
 
        * gdk/x11/gdkevents-x11.c: map the new GtkSettings properties
        "timeout-initial", "timeout-repeat", "color-scheme" and
-       "enable-enimations" to X settings.
+       "enable-animations" to X settings.
 
 2005-12-05  Matthias Clasen  <mclasen@redhat.com>
 

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index def6b877f46da4fa359cbe4d6514f44071a3e3f2..aa91bd4a2a3e998f4a54bd286a497ebb3e6e4180 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -78,6 +78,7 @@ struct _GtkEntryPrivate
 {
   gfloat xalign;
   gint insert_pos;
+  gboolean truncate_multiline; /* when pasting multiline text */
 };
 
 enum {
@@ -107,7 +108,8 @@ enum {
   PROP_WIDTH_CHARS,
   PROP_SCROLL_OFFSET,
   PROP_TEXT,
-  PROP_XALIGN
+  PROP_XALIGN,
+  PROP_TRUNCATE_MULTILINE
 };
 
 static guint signals[LAST_SIGNAL] = { 0 };
@@ -597,7 +599,22 @@ gtk_entry_class_init (GtkEntryClass *class)
                                                       1.0,
                                                       0.0,
                                                       GTK_PARAM_READWRITE));
-  
+
+  /**
+   * GtkEntry:truncate-multiline:
+   *
+   * When %TRUE, pasted multi-line text is truncated to the first line.
+   *
+   * Since: 2.10
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_TRUNCATE_MULTILINE,
+                                   g_param_spec_boolean ("truncate-multiline",
+                                                         P_("Truncate multiline"),
+                                                         P_("Whether to truncate multiline pastes to one line."),
+                                                         FALSE,
+                                                         GTK_PARAM_READWRITE));
+
   signals[POPULATE_POPUP] =
     g_signal_new (I_("populate_popup"),
                  G_OBJECT_CLASS_TYPE (gobject_class),
@@ -887,6 +904,7 @@ gtk_entry_set_property (GObject         *object,
                         GParamSpec      *pspec)
 {
   GtkEntry *entry = GTK_ENTRY (object);
+  GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
 
   switch (prop_id)
     {
@@ -948,6 +966,10 @@ gtk_entry_set_property (GObject         *object,
       gtk_entry_set_alignment (entry, g_value_get_float (value));
       break;
 
+    case PROP_TRUNCATE_MULTILINE:
+      priv->truncate_multiline = g_value_get_boolean (value);
+      break;
+
     case PROP_SCROLL_OFFSET:
     case PROP_CURSOR_POSITION:
     default:
@@ -963,6 +985,7 @@ gtk_entry_get_property (GObject         *object,
                         GParamSpec      *pspec)
 {
   GtkEntry *entry = GTK_ENTRY (object);
+  GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
 
   switch (prop_id)
     {
@@ -1002,7 +1025,10 @@ gtk_entry_get_property (GObject         *object,
     case PROP_XALIGN:
       g_value_set_float (value, gtk_entry_get_alignment (entry));
       break;
-      
+    case PROP_TRUNCATE_MULTILINE:
+      g_value_set_boolean (value, priv->truncate_multiline);
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1029,6 +1055,7 @@ gtk_entry_init (GtkEntry *entry)
   entry->editing_canceled = FALSE;
   entry->has_frame = TRUE;
   priv->xalign = 0.0;
+  priv->truncate_multiline = FALSE;
 
   gtk_drag_dest_set (GTK_WIDGET (entry),
                      GTK_DEST_DEFAULT_HIGHLIGHT,
@@ -3740,6 +3767,18 @@ gtk_entry_get_public_chars (GtkEntry *entry,
     }
 }
 
+static gint
+truncate_multiline (const gchar *text)
+{
+  gint length;
+
+  for (length = 0;
+       text[length] && text[length] != '\n' && text[length] != '\r';
+       length++);
+
+  return length;
+}
+
 static void
 paste_received (GtkClipboard *clipboard,
                const gchar  *text,
@@ -3761,8 +3800,12 @@ paste_received (GtkClipboard *clipboard,
   if (text)
     {
       gint pos, start, end;
+      gint length = -1;
       GtkEntryCompletion *completion = gtk_entry_get_completion (entry);
 
+      if (priv->truncate_multiline)
+        length = truncate_multiline (text);
+
       if (completion)
        {
          g_signal_handler_block (entry, completion->priv->changed_id);
@@ -3774,7 +3817,7 @@ paste_received (GtkClipboard *clipboard,
         gtk_editable_delete_text (editable, start, end);
 
       pos = entry->current_pos;
-      gtk_editable_insert_text (editable, text, -1, &pos);
+      gtk_editable_insert_text (editable, text, length, &pos);
       gtk_editable_set_position (editable, pos);
 
       if (completion)
@@ -4833,6 +4876,7 @@ gtk_entry_drag_data_received (GtkWidget        *widget,
                              guint             time)
 {
   GtkEntry *entry = GTK_ENTRY (widget);
+  GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (widget);
   GtkEditable *editable = GTK_EDITABLE (widget);
   gchar *str;
 
@@ -4842,19 +4886,23 @@ gtk_entry_drag_data_received (GtkWidget        *widget,
     {
       gint new_position;
       gint sel1, sel2;
+      gint length = -1;
+
+      if (priv->truncate_multiline)
+        length = truncate_multiline (str);
 
       new_position = gtk_entry_find_position (entry, x + entry->scroll_offset);
 
       if (!gtk_editable_get_selection_bounds (editable, &sel1, &sel2) ||
          new_position < sel1 || new_position > sel2)
        {
-         gtk_editable_insert_text (editable, str, -1, &new_position);
+         gtk_editable_insert_text (editable, str, length, &new_position);
        }
       else
        {
          /* Replacing selection */
          gtk_editable_delete_text (editable, sel1, sel2);
-         gtk_editable_insert_text (editable, str, -1, &sel1);
+         gtk_editable_insert_text (editable, str, length, &sel1);
        }
       
       g_free (str);

diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index 6894c6c4a727d482904601790c745a135d4dd35e..acbd1206c27038a06b2f41ad12aa529ecdf7685a 100644 (file)
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -177,6 +177,8 @@ gtk_file_chooser_entry_init (GtkFileChooserEntry *chooser_entry)
   GtkEntryCompletion *comp;
   GtkCellRenderer *cell;
 
+  g_object_set (chooser_entry, "truncate-multiline", TRUE, NULL);
+
   comp = gtk_entry_completion_new ();
   gtk_entry_completion_set_popup_single_match (comp, FALSE);